Update debian/changelog for 24.2+1-1 release.

diff --git a/debian/changelog b/debian/changelog
index ae83804f37fe13a4eae1774e711234a67a1cae9d..e3b779a9054ddab8ab39f6a8d2cde06ad88bf4e5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,28 @@
-emacs24 (24.2+1-1~1.gbpfee5d5) UNRELEASED; urgency=low
+emacs24 (24.2+1-1) unstable; urgency=high
 
-  ** SNAPSHOT build @fee5d583f06d048c0fa332c70a875f789d318485 **
+  * Upgrade to upstream version 24.2 and update debian/patches.
 
-  * UNRELEASED
+  * Remove patches that have been incorporated upstream:
+      0010-Rename-infodir-to-buildinfodir-in-doc-Makefile.in-GN.patch
 
- -- Rob Browning <rlb@defaultvalue.org>  Sat, 08 Sep 2012 16:54:16 -0500
+  * Stop producing the emacs binary metapackage.
+    Move the emacs binary metapackage to its own source package
+    (emacs-defaults, cf. gcc-defaults).  This will prevent emacs23 and
+    emacs24 from producing the same binary package.
+
+  * Don't eval code when enable-local-variables is :safe.  Previously,
+    Emacs might eval forms in file-local variable sections even when
+    the Emacs user option `enable-local-variables' was set to :safe
+    (CVE-2012-3479).  Emacs 24.2 fixes the problem.  Thanks to Henri
+    Salo <henri@nerv.fi> for the report.  (Closes: #684695)
+
+  * Have debian/% depend on debian/rules since it now sets the
+    upstream_ver.
+
+  * Update debian/rules upstream_ver to 24.2 and run "debian/rules
+    debian-sync".
+
+ -- Rob Browning <rlb@defaultvalue.org>  Sun, 09 Sep 2012 12:03:31 -0500
 
 emacs24 (24.1+1-4) unstable; urgency=low